Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3 -> 5 #1330

Merged
merged 4 commits into from
Feb 14, 2022
Merged

3 -> 5 #1330

merged 4 commits into from
Feb 14, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Feb 9, 2022

➡️ Forward port

Port ign-gazebo3 to ign-gazebo5

Branch comparison: ign-gazebo5...ign-gazebo3

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

ahcorde and others added 3 commits February 4, 2022 09:36
@ahcorde
Removed unused variables in shapes plugin (#1321)
e032208 
Signed-off-by: ahcorde <ahcorde@gmail.com>
@nlamprian @nkoenig
Add elevator system (#535)
7b4fcda 
* Add elevator system

Closes #420

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Limit line length for transition table

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Add PRIVATE_INCLUDE_DIRS argument to gz_add_system

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Add afsm and metapushkin libraries

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Add namespace to events, actions and guards

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Migrate to afsm

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

* Fixes

Signed-off-by: Nick Lamprianidis <nlamprian@gmail.com>

Co-authored-by: Nate Koenig <nkoenig@users.noreply.github.com>
@iche033
merge from ign-gazebo3
30c2510 
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Feb 9, 2022
@codecov
Copy link

codecov bot commented Feb 10, 2022 •
edited
Loading

Codecov Report

Merging #1330 (5c02827) into ign-gazebo5 (1173c06) will increase coverage by 0.63%.
The diff coverage is 84.09%.

❗ Current head 5c02827 differs from pull request most recent head 9feb7b5. Consider uploading reports for the commit 9feb7b5 to get more accurate results

Impacted file tree graph

@@               Coverage Diff               @@
##           ign-gazebo5    #1330      +/-   ##
===============================================
+ Coverage        66.27%   66.91%   +0.63%     
===============================================
  Files              255      276      +21     
  Lines            20213    20926     +713     
===============================================
+ Hits             13397    14002     +605     
- Misses            6816     6924     +108
Impacted Files Coverage Δ
...clude/ignition/gazebo/components/CenterOfVolume.hh 100.00% <ø> (ø)
src/gui/plugins/scene3d/Scene3D.hh 50.00% <ø> (ø)
src/gui/plugins/shapes/Shapes.cc 22.72% <ø> (ø)
src/systems/elevator/ElevatorCommonPrivate.hh 0.00% <0.00%> (ø)
src/systems/elevator/ElevatorStateMachine.hh 0.00% <0.00%> (ø)
src/systems/elevator/utils/DoorTimer.hh 0.00% <0.00%> (ø)
src/systems/elevator/utils/JointMonitor.hh 0.00% <0.00%> (ø)
...int_position_controller/JointPositionController.cc 67.54% <0.00%> (-2.46%) ⬇️
src/gui/plugins/scene3d/Scene3D.cc 10.12% <28.12%> (+0.42%) ⬆️
src/systems/air_pressure/AirPressure.cc 72.15% <71.42%> (-1.83%) ⬇️
... and 23 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 012c25c...9feb7b5. Read the comment docs.

ahcorde
ahcorde requested changes Feb 10, 2022
View reviewed changes
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows is not compiling https://build.osrfoundation.org/job/ign_gazebo-pr-win/3757/consoleFull#15361684098ff58640-3599-4406-a210-216932f1748c

@iche033
Copy link
Contributor Author

iche033 commented Feb 11, 2022 •
edited
Loading

Error due to recently added vendor library. Looks like there is an open issue about this compiler error on Windows VS2017: zmij/afsm#20

Testing the suggested fix in 4b2925f

@iche033
Copy link
Contributor Author

iche033 commented Feb 11, 2022 •
edited
Loading

there are a few more compile errors after the fix in 4b2925f. So for the time being I disabled the elevator system on windows.

@iche033
disable elevator system on windows
9feb7b5 
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@iche033
Copy link
Contributor Author

iche033 commented Feb 11, 2022

Windows is building now. There is a test failure, INTEGRATION_buoyancy, that looks unrelated to the changes being forward ported in this PR.

@iche033 iche033 requested a review from ahcorde February 14, 2022 19:19
@iche033 iche033 merged commit bcb1a36 into ign-gazebo5 Feb 14, 2022
@iche033 iche033 deleted the merge_3_5_20220209 branch February 14, 2022 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nkoenig nkoenig nkoenig approved these changes

@ahcorde ahcorde ahcorde approved these changes

@chapulina chapulina Awaiting requested review from chapulina

Assignees
No one assigned
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@iche033 @nkoenig @ahcorde @nlamprian